Check if player has data key here as well

Fixes #272