Fix org queue_init