Fix gating on corner squares