Fixed waitOn methods