waitForIdle issue

Given the method waitForIdle from the BasicRobot. It iterates through all queues and waits until the queue is cleared before moving to the next. But given a scenario with queues A and B. B is working.
Robot checks A. Robot checks B. Waits. B enqueues element in A. Robot checks B --> All queues cleared, though A is still working.

I have a possible solution in mind, let me know what you think.