Fix queueing of messages