Wait For -- keyword bug fix