Add the fix for issue 4509 to the mapping methods.
2 files changed