Fixing a world crashing bug!