Removed queue.size dependency (not reliable)