[#364] Fixed to only set value if field_value is empty