diff --git a/psqlextra/query.py b/psqlextra/query.py
index 27d27c5e..aeec2a1b 100644
--- a/psqlextra/query.py
+++ b/psqlextra/query.py
@@ -114,9 +114,10 @@ def add_fields(self, field_names: List[str], allow_m2m: bool=True) -> bool:
                         HStoreColumn(self.model._meta.db_table or self.model.name, field, hstore_key)
                     )
                     continue
-
-            _, targets, _, joins, path = self.setup_joins(parts, opts, alias, allow_many=allow_m2m)
-            targets, final_alias, joins = self.trim_joins(targets, joins, path)
+            join_info = self.setup_joins(parts, opts, alias, allow_many=allow_m2m)
+            targets, final_alias, joins = self.trim_joins(
+                join_info.targets, join_info.joins, join_info.path
+            )
 
             for target in targets:
                 cols.append(target.get_col(final_alias))