Fixed end game behavior