Try to fix queue_classic issue