Fix queueing bug