Queuing fix