Fix of queues