Fix for Issue #1384

In this fix for #1384 , I tried to stay close to Mapper implementation. 

Not sure if a little test I made makes much sense.