Fixed init with queues