bugfix in _apply_default_fields