Reworked play mechanism to prevent deadlock.