Improve mq-core#3