diff --git a/src/clj/coffi/ffi.clj b/src/clj/coffi/ffi.clj
index 697e6c3..5057346 100644
--- a/src/clj/coffi/ffi.clj
+++ b/src/clj/coffi/ffi.clj
@@ -506,10 +506,7 @@
   ([args] (method-type args ::mem/void))
   ([args ret]
    (MethodType/methodType
-    ^Class (let [r (mem/java-layout ret)]
-             (if (= r MemoryAddress)
-               Addressable
-               r))
+    ^Class (coerce-addressable (mem/java-layout ret))
     ^"[Ljava.lang.Class;" (into-array Class (map mem/java-layout args)))))
 
 (defn- upcall-handle