fix 58 - Make them wait