Fixes field mapping issue