Fixing end game