fix wait until not issue