field_wrapper fix