Fix issue with play timing