Fixed some of the cases where the player was wrongly disqualified