Fixed game start and end