diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index be38ca9..c7c8f17 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -3152,8 +3152,8 @@
       </modify-argument>
     </modify-function>
     <modify-function signature="setWidget(QWidget *)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
+      <modify-argument index="this">
+        <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
   </object-type>
diff --git a/tests/QtGui/CMakeLists.txt b/tests/QtGui/CMakeLists.txt
index 65b10e8..4514731 100644
--- a/tests/QtGui/CMakeLists.txt
+++ b/tests/QtGui/CMakeLists.txt
@@ -22,6 +22,7 @@ PYSIDE_TEST(bug_493.py)
 PYSIDE_TEST(bug_500.py)
 PYSIDE_TEST(bug_512.py)
 PYSIDE_TEST(bug_525.py)
+PYSIDE_TEST(bug_546.py)
 PYSIDE_TEST(bug_547.py)
 PYSIDE_TEST(bug_549.py)
 PYSIDE_TEST(bug_569.py)
diff --git a/tests/QtGui/bug_546.py b/tests/QtGui/bug_546.py
new file mode 100644
index 0000000..845b64e
--- /dev/null
+++ b/tests/QtGui/bug_546.py
@@ -0,0 +1,14 @@
+import unittest
+from PySide.QtGui import *
+
+class TestBug546(unittest.TestCase):
+
+    """Test to check a crash at exit"""
+    def testIt(self):
+        app = QApplication([])
+        textEdit = QPlainTextEdit()
+        completer = QCompleter(("foo", "bar"), textEdit)
+        completer.setWidget(textEdit)
+
+if __name__=='__main__':
+    unittest.main()