Game-crashing bug from last commit fixed