Fixed a wrong operation on the message queue.
Merge remote-tracking branch 'origin/master'