Fixed same crashes for player as well