Fix for Grandmapocalypse