diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py
index f5e4288b..c5198241 100644
--- a/jedi/evaluate/representation.py
+++ b/jedi/evaluate/representation.py
@@ -473,7 +473,7 @@ class Function(use_metaclass(CachedMetaClass, Wrapper)):
                 if trailer:
                     # Create a trailer and evaluate it.
                     trailer = pr.Node(python_symbols.trailer, trailer)
-                    dec_results = self._evaluator.eval_trailer(trailer)
+                    dec_results = self._evaluator.eval_trailer(dec_results, trailer)
 
                 if not len(dec_results):
                     debug.warning('decorator not found: %s on %s', dec, self.base_func)
diff --git a/jedi/parser/representation.py b/jedi/parser/representation.py
index 789c5966..0ba1e0ae 100644
--- a/jedi/parser/representation.py
+++ b/jedi/parser/representation.py
@@ -548,7 +548,7 @@ class Scope(Simple, DocstringMixin):
                          if isinstance(s, (ExprStmt, Import))])
                 elif isinstance(c, (Function, Class)):
                     names.append(c.name)
-                elif isinstance(c, Flow) or is_node(c, 'suite'):
+                elif isinstance(c, Flow) or is_node(c, 'suite', 'decorated'):
                     names += scan(c.children)
             return names