Fix waiting() method