fixing null Player