diff --git a/core/src/main/scala/lacasa/Actor.scala b/core/src/main/scala/lacasa/Actor.scala
index ac9f45c..e26581f 100644
--- a/core/src/main/scala/lacasa/Actor.scala
+++ b/core/src/main/scala/lacasa/Actor.scala
@@ -18,6 +18,7 @@ object doNothing {
       type Captured = Nothing
       type Excluded = box.C
       def apply(): Unit = {}
+      def skipScalaSamConversion: Nothing = ???
     }
 }
 
@@ -29,6 +30,7 @@ object sleep {
       def apply(): Unit = {
         Thread.sleep(millis)
       }
+      def skipScalaSamConversion: Nothing = ???
     }
 }
 
diff --git a/core/src/main/scala/lacasa/Box.scala b/core/src/main/scala/lacasa/Box.scala
index 803f292..092cc3c 100644
--- a/core/src/main/scala/lacasa/Box.scala
+++ b/core/src/main/scala/lacasa/Box.scala
@@ -119,7 +119,7 @@ sealed class Box[+T] private (private val instance: T) {
    * The argument `assign` must have the form `(x, y) => x.f = y`.
    */
   def capture[S](consumed: Box[S])(assign: (T, S) => Unit)(
-    fun: Spore[Packed[T], Unit] /*{ type Excluded = consumed.C }*/)( // TODO: fix spores
+    fun: Spore[Packed[T], Unit] { type Excluded = consumed.C })( // TODO: fix spores
     implicit access: CanAccess { type C = self.C },
       accessConsumed: CanAccess { type C = consumed.C }): Nothing = {
 
diff --git a/core/src/test/scala/lacasa/test/CaptureSpec.scala b/core/src/test/scala/lacasa/test/CaptureSpec.scala
index 47841a7..e406aac 100644
--- a/core/src/test/scala/lacasa/test/CaptureSpec.scala
+++ b/core/src/test/scala/lacasa/test/CaptureSpec.scala
@@ -8,7 +8,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 
 import scala.spores._
-import scala.spores.SporeConv._
+//import scala.spores.SporeConv._
 
 import lacasa.{Box, Packed}
 import Box._
diff --git a/core/src/test/scala/lacasa/test/actor.scala b/core/src/test/scala/lacasa/test/actor.scala
index 7e5925f..c1118dc 100644
--- a/core/src/test/scala/lacasa/test/actor.scala
+++ b/core/src/test/scala/lacasa/test/actor.scala
@@ -14,7 +14,7 @@ import scala.concurrent.{Future, Promise, Await}
 import scala.concurrent.duration._
 
 import scala.spores._
-import scala.spores.SporeConv._
+//import scala.spores.SporeConv._
 
 import lacasa.{System, Box, CanAccess, Actor, ActorRef}
 import Box._
diff --git a/project/LaCasaBuild.scala b/project/LaCasaBuild.scala
index b4ed8a5..464c792 100644
--- a/project/LaCasaBuild.scala
+++ b/project/LaCasaBuild.scala
@@ -20,7 +20,7 @@ object LaCasaBuild extends Build {
     scalacOptions ++= Seq("-deprecation", "-feature"),
     parallelExecution in Test := false,
     logBuffered := false,
-    libraryDependencies += "org.scala-lang.modules" %% "spores-core" % "0.2.4",
+    libraryDependencies += "ch.epfl.scala" %% "spores" % "0.5.0-SNAPSHOT",
     libraryDependencies <+= (scalaVersion)("org.scala-lang" % "scala-reflect" % _),
     scalaHome := {
       val scalaHome = System.getProperty("lacasa.scala.home")