correctly handle when exclude_fields is None