fixing up after wait was removed