Pre mapping is now respected by automatic mapping fixes and close issue #11