Fix minor issue when field_value is no longer a string