refactor play - fix bug