Attempted fix of message queue errors