Re-add grid bugs