Fix queueing issue