Fixing play - needs testing on server