When are we gonna fix the queue