Fixed timing issues with play