diff --git a/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala b/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala
index 9f3db40ed5..2efb87466d 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala
@@ -32,9 +32,6 @@ object ZeroMQExtension extends ExtensionId[ZeroMQExtension] with ExtensionIdProv
 
   private val minVersionString = "2.1.0"
   private val minVersion = JZMQ.makeVersion(2, 1, 0)
-
-  private[zeromq] def check[TOption <: SocketOption: Manifest](parameters: Seq[SocketOption]) =
-    parameters exists { p ⇒ ClassTag.singleType(p) <:< manifest[TOption] }
 }
 
 /**
@@ -61,7 +58,10 @@ class ZeroMQExtension(system: ActorSystem) extends Extension {
    */
   def newSocketProps(socketParameters: SocketOption*): Props = {
     verifyZeroMQVersion
-    require(ZeroMQExtension.check[SocketType.ZMQSocketType](socketParameters), "A socket type is required")
+    require(socketParameters exists {
+      case s: SocketType.ZMQSocketType ⇒ true
+      case _                           ⇒ false
+    }, "A socket type is required")
     Props(new ConcurrentSocketActor(socketParameters)).withDispatcher("akka.zeromq.socket-dispatcher")
   }
 
diff --git a/akka-zeromq/src/main/scala/akka/zeromq/package.scala b/akka-zeromq/src/main/scala/akka/zeromq/package.scala
index 1241700fcb..c10ad9eb85 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/package.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/package.scala
@@ -3,6 +3,8 @@
  */
 package akka
 
+import language.implicitConversions
+
 import actor.ActorSystem
 
 /**
diff --git a/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala b/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala
index e075ca2158..ebf8c5518f 100644
--- a/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala
+++ b/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala
@@ -3,6 +3,8 @@
  */
 package akka.zeromq
 
+import language.postfixOps
+
 import org.scalatest.matchers.MustMatchers
 import akka.testkit.{ TestProbe, DefaultTimeout, AkkaSpec }
 import akka.util.duration._
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 9188df566e..a406669ff3 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -482,7 +482,7 @@ object Dependency {
   val protobuf      = "com.google.protobuf"         % "protobuf-java"         % "2.4.1"       // New BSD
   val scalaStm      = "org.scala-tools"             %% "scala-stm"            % "0.5"         // Modified BSD (Scala)
   val slf4jApi      = "org.slf4j"                   % "slf4j-api"             % "1.6.4"       // MIT
-  val zeroMQ        = "org.zeromq"                  %% "zeromq-scala-binding" % "0.0.6"       // ApacheV2
+  val zeroMQ        = "org.zeromq"                  %% "zeromq-scala-binding" % "0.0.6.1-B1"  // ApacheV2  //FIXME SWITCH TO OFFICIAL VERSION
   val uncommonsMath = "org.uncommons.maths"         % "uncommons-maths"       % "1.2.2a"      // ApacheV2