fixed empty extra_fields situation