diff --git a/djangotoolbox/db/basecompiler.py b/djangotoolbox/db/basecompiler.py
index d49a4f9..a1ddd4e 100644
--- a/djangotoolbox/db/basecompiler.py
+++ b/djangotoolbox/db/basecompiler.py
@@ -28,13 +28,21 @@ class EmptyResultSet(Exception):
 else:
     from django.db.models.sql.constants import LOOKUP_SEP
 
-if django.VERSION >= (1, 6):
+if django.VERSION >= (1, 8):
+    def get_selected_fields(query):
+        if query.select:
+            return [info.target for info in query.select]
+        else:
+            return query.model._meta.fields
+
+elif django.VERSION >= (1, 6):
     def get_selected_fields(query):
         if query.select:
             return [info.field for info in (query.select +
                         query.related_select_cols)]
         else:
             return query.model._meta.fields
+
 else:
     def get_selected_fields(query):
         if query.select_fields: