Fix waiting color
Fix while loop when shuffle