diff --git a/jedi/parsing.py b/jedi/parsing.py
index 68d072c3..4ae514a6 100644
--- a/jedi/parsing.py
+++ b/jedi/parsing.py
@@ -413,6 +413,7 @@ class Parser(object):
             with common.ignored(IndexError, AttributeError):
                 # ... then set it as a docstring
                 self._scope.statements[-1].add_docstr(first_tok[1])
+                return None, tok
 
         if tok in always_break + not_first_break:
             self._gen.push_last_back()
diff --git a/jedi/parsing_representation.py b/jedi/parsing_representation.py
index a51cc76f..c5478e51 100644
--- a/jedi/parsing_representation.py
+++ b/jedi/parsing_representation.py
@@ -800,6 +800,8 @@ class Statement(Simple):
 
         code = ''.join(assemble(*a) for a in self.assignment_details)
         code += assemble(self.get_commands())
+        if self.docstr:
+            code += '\n"""%s"""' % self.docstr
 
         if new_line:
             return code + '\n'
diff --git a/test/test_parsing_representation.py b/test/test_parsing_representation.py
index e090d4d4..bb6531c5 100644
--- a/test/test_parsing_representation.py
+++ b/test/test_parsing_representation.py
@@ -7,7 +7,7 @@ def test_get_code():
 class SomeClass(object, mixin):
     def __init__(self):
         self.xy = 3.0
-        'statement docstr'
+        """statement docstr"""
     def some_method(self):
         return 1
     def yield_method(self):