Fix game flow