Fix: Proper handling of queues