Fixed wait_for/until callback issue