Hopefully fix grid for good