diff --git a/src/com2ann.py b/src/com2ann.py
index b1683e3..166672e 100644
--- a/src/com2ann.py
+++ b/src/com2ann.py
@@ -459,6 +459,7 @@ def wrap_function_header(header: str) -> List[str]:
     parts: List[str] = []
     next_part = ''
     nested = 0
+    complete = False  # Did we split all the arguments inside (...)?
     indent: Optional[int] = None
 
     for i, c in enumerate(header):
@@ -468,7 +469,9 @@ def wrap_function_header(header: str) -> List[str]:
                 indent = i + 1
         if c in ')]}':
             nested -= 1
-        if c == ',' and nested == 1:
+            if not nested:
+                complete = True
+        if c == ',' and nested == 1 and not complete:
             next_part += c
             parts.append(next_part)
             next_part = ''

diff --git a/src/test_com2ann.py b/src/test_com2ann.py
index fafb71c..6cef088 100644
--- a/src/test_com2ann.py
+++ b/src/test_com2ann.py
@@ -411,6 +411,19 @@ class FunctionTestCase(BaseTestCase):
                          *fake_receipts: str) -> None:
                 pass
             """, False, False, 10)
+        self.check(
+            """
+            def embezzle(self, account, funds=MANY, *fake_receipts):
+                # type: (str, int, *str) -> Dict[str, Dict[str, int]]
+                pass
+            """,
+            """
+            def embezzle(self,
+                         account: str,
+                         funds: int = MANY,
+                         *fake_receipts: str) -> Dict[str, Dict[str, int]]:
+                pass
+            """, False, False, 10)
 
     def test_decorator_body(self) -> None:
         self.check(

When using --wrap-signatures, return annotations with commas also get wrapped
For example:
```python
def func(arg1: SomeVeryLongType1,
         arg2: SomeVeryLongType2) -> Dict[str,
         int]:
    ...
```
This is not a syntax error, but looks ugly.
src/test_com2ann.py::FunctionTestCase::test_wrap_lines
src/test_com2ann.py::AssignTestCase::test_basics src/test_com2ann.py::AssignTestCase::test_coding_kept src/test_com2ann.py::AssignTestCase::test_comment_on_separate_line src/test_com2ann.py::AssignTestCase::test_complete_tuple src/test_com2ann.py::AssignTestCase::test_complex_targets src/test_com2ann.py::AssignTestCase::test_continuation_using_parens src/test_com2ann.py::AssignTestCase::test_drop_Ellipsis src/test_com2ann.py::AssignTestCase::test_drop_None src/test_com2ann.py::AssignTestCase::test_literal_types src/test_com2ann.py::AssignTestCase::test_multi_line_assign src/test_com2ann.py::AssignTestCase::test_multi_line_tuple_value src/test_com2ann.py::AssignTestCase::test_newline src/test_com2ann.py::AssignTestCase::test_parenthesized_lhs src/test_com2ann.py::AssignTestCase::test_pattern src/test_com2ann.py::AssignTestCase::test_type_ignore src/test_com2ann.py::AssignTestCase::test_uneven_spacing src/test_com2ann.py::AssignTestCase::test_wrong src/test_com2ann.py::FunctionTestCase::test_async_single src/test_com2ann.py::FunctionTestCase::test_combined_annotations_multi src/test_com2ann.py::FunctionTestCase::test_combined_annotations_single src/test_com2ann.py::FunctionTestCase::test_complex_kinds src/test_com2ann.py::FunctionTestCase::test_decorator_body src/test_com2ann.py::FunctionTestCase::test_literal_type src/test_com2ann.py::FunctionTestCase::test_self_argument src/test_com2ann.py::FunctionTestCase::test_single src/test_com2ann.py::LineReportingTestCase::test_confusing_function_comments src/test_com2ann.py::LineReportingTestCase::test_invalid_function_comments src/test_com2ann.py::LineReportingTestCase::test_simple_assign src/test_com2ann.py::LineReportingTestCase::test_simple_function src/test_com2ann.py::LineReportingTestCase::test_unsupported_assigns src/test_com2ann.py::LineReportingTestCase::test_unsupported_statements src/test_com2ann.py::ForAndWithTestCase::test_async_for src/test_com2ann.py::ForAndWithTestCase::test_async_with src/test_com2ann.py::ForAndWithTestCase::test_for src/test_com2ann.py::ForAndWithTestCase::test_with src/test_com2ann.py::FutureImportTestCase::test_added_future_import src/test_com2ann.py::FutureImportTestCase::test_not_added_future_import