Solved bugs where game never ended