FIX: Only reset check_waiting where necessary.