Fix end of game - part 2