reorder repeat and play to try to make repeat start robustly