Fixing conditions for default end-game message