Trying to fix the queues