handle more corner cases of wierd timing issues around the queues