Fix play / stop handlers