Fix the behavior of waiting