diff --git a/fbchat/client.py b/fbchat/client.py
index 2b20d69..392f71a 100644
--- a/fbchat/client.py
+++ b/fbchat/client.py
@@ -1529,13 +1529,18 @@ class Client(object):
                     self.onInbox(unseen=m["unseen"], unread=m["unread"], recent_unread=m["recent_unread"], msg=m)
 
                 # Typing
-                elif mtype == "typ":
+                elif mtype == "typ" or mtype == "ttyp":
                     author_id = str(m.get("from"))
-                    thread_id = str(m.get("to"))
-                    if thread_id == self.uid:
-                        thread_type = ThreadType.USER
-                    else:
+                    thread_id = m.get("thread_fbid")
+                    if thread_id:
                         thread_type = ThreadType.GROUP
+                        thread_id = str(thread_id)
+                    else:
+                        thread_type = ThreadType.USER
+                        if author_id == self.uid:
+                            thread_id = m.get("to")
+                        else:
+                            thread_id = author_id
                     typing_status = TypingStatus(m.get("st"))
                     self.onTyping(author_id=author_id, status=typing_status, thread_id=thread_id, thread_type=thread_type, msg=m)
 
diff --git a/tests/test_thread_interraction.py b/tests/test_thread_interraction.py
index 7aa744a..9844998 100644
--- a/tests/test_thread_interraction.py
+++ b/tests/test_thread_interraction.py
@@ -103,10 +103,8 @@ def test_change_color_invalid(client):
     client.changeThreadColor(InvalidColor())
 
 
-@pytest.mark.xfail(reason="Apparently onTyping is broken")
 @pytest.mark.parametrize("status", TypingStatus)
 def test_typing_status(client, catch_event, compare, status):
     with catch_event("onTyping") as x:
         client.setTypingStatus(status)
-        # x.wait(40)
     assert compare(x, status=status)