Bugfix, cleaning up awaiting map on MT.
2.2.1 release