Fixed end of game handling