Fix the cells :D