Improve mq-core#FIN