diff --git a/src/main/scala/li/cil/oc/server/driver/Registry.scala b/src/main/scala/li/cil/oc/server/driver/Registry.scala
index 6c6837607..326e70b27 100644
--- a/src/main/scala/li/cil/oc/server/driver/Registry.scala
+++ b/src/main/scala/li/cil/oc/server/driver/Registry.scala
@@ -6,6 +6,7 @@ import li.cil.oc.api.driver.Converter
 import li.cil.oc.{OpenComputers, api}
 import net.minecraft.item.ItemStack
 import net.minecraft.world.World
+import scala.collection.convert.WrapAsScala._
 import scala.collection.mutable.ArrayBuffer
 
 /**
@@ -90,6 +91,9 @@ private[oc] object Registry extends api.detail.DriverAPI {
     case arg: Map[_, _] => arg.map {
       case (key: AnyRef, value: AnyRef) => convertRecursively(key) -> convertRecursively(value)
     }
+    case arg: java.util.Map[_, _] => arg.map {
+      case (key: AnyRef, value: AnyRef) => convertRecursively(key) -> convertRecursively(value)
+    }
 
     case arg =>
       val result = new util.HashMap[AnyRef, AnyRef]()