diff --git a/jedi/api/completion.py b/jedi/api/completion.py
index b18fa773..e2e2b178 100644
--- a/jedi/api/completion.py
+++ b/jedi/api/completion.py
@@ -288,5 +288,6 @@ class Completion:
         next(filters)
         for filter in filters:
             for name in filter.values():
+                # TODO we should probably check here for properties
                 if (name.api_type == 'function') == is_function:
                     yield name
diff --git a/test/completion/context.py b/test/completion/context.py
index 81865d00..d77c79c3 100644
--- a/test/completion/context.py
+++ b/test/completion/context.py
@@ -20,10 +20,14 @@ class Y(X):
     __doc__
     #? []
     def __doc__
-    # This might or might not be what we want, currently properties are also
-    # used like this.
+
+    # This might or might not be what we wanted, currently properties are also
+    # used like this. IMO this is not wanted ~dave.
     #? ['__class__']
     def __class__
+    #? []
+    __class__
+
 
     #? ['__repr__']
     def __repr__