more get_fields fixes