Fixed for message queue