Fixed issue with m2e metadata mapping