Fix play logic