Improve mq-core#2