Queueing dev fix