Eeek, that last commit had more than it was supposed to, fixing grid bug