1 files changed, 3 insertions, 3 deletions
diff --git a/lib/jid.ml b/lib/jid.ml
index ab2e0e5..2cd7214 100644
--- a/lib/jid.ml
+++ b/lib/jid.ml
@@ -38,17 +38,17 @@ let of_string (s : string) : t =
         then Some (i, drop i jid |> string_of_uchars)
         else None) jid
     |> Option.fold ~none:(length jid, None) ~some:(fun (i, s) -> i, Some s)
-  and dstart, localpart =
+  and dlen, localpart =
     rev jid
     |> find_mapi (fun i c ->
            if c = Uchar.of_char '@'
-           then Some (i, take i jid |> rev |> string_of_uchars)
+           then Some (i, take (length jid - i - 1) jid |> string_of_uchars)
            else None)
     |> Option.fold ~none:(0, None) ~some:(fun (i, s) -> i, Some s)
   in {
        localpart;
        resourcepart;
-       domainpart = drop dstart jid |> take (dend-dstart) |> string_of_uchars
+       domainpart = drop (dend-dlen) jid |> take dlen |> string_of_uchars
      }
 
 let%expect_test {|A "bare JID"|} =