Temporary fix of wrong dynamic field mapping.