diff --git a/src/main/scala/scala/async/internal/AnfTransform.scala b/src/main/scala/scala/async/internal/AnfTransform.scala
index e54eb543..c4dd2b70 100644
--- a/src/main/scala/scala/async/internal/AnfTransform.scala
+++ b/src/main/scala/scala/async/internal/AnfTransform.scala
@@ -102,7 +102,7 @@ private[async] trait AnfTransform {
 
         private def defineVar(prefix: String, tp: Type, pos: Position): ValDef = {
           val sym = api.currentOwner.newTermSymbol(name.fresh(prefix), pos, MUTABLE | SYNTHETIC).setInfo(uncheckedBounds(tp))
-          valDef(sym, gen.mkZero(uncheckedBounds(tp))).setType(NoType).setPos(pos)
+          valDef(sym, EmptyTree).setType(NoType).setPos(pos)
         }
       }
 
diff --git a/src/main/scala/scala/async/internal/AsyncTransform.scala b/src/main/scala/scala/async/internal/AsyncTransform.scala
index 66cfb875..82297e4b 100644
--- a/src/main/scala/scala/async/internal/AsyncTransform.scala
+++ b/src/main/scala/scala/async/internal/AsyncTransform.scala
@@ -81,7 +81,7 @@ trait AsyncTransform {
           List(
             asyncBase.nullOut(c.universe)(c.Expr[String](Literal(Constant(fieldSym.name.toString))), c.Expr[Any](Ident(fieldSym))).tree
           ),
-          Assign(gen.mkAttributedStableRef(thisType(fieldSym.owner), fieldSym), gen.mkZero(fieldSym.info))
+          Assign(gen.mkAttributedStableRef(thisType(fieldSym.owner), fieldSym), EmptyTree)
         )
       }
       val asyncState = asyncBlock.asyncStates.find(_.state == state).get
diff --git a/src/test/scala/scala/async/run/toughtype/ToughType.scala b/src/test/scala/scala/async/run/toughtype/ToughType.scala
index 5ff16050..5059bfc5 100644
--- a/src/test/scala/scala/async/run/toughtype/ToughType.scala
+++ b/src/test/scala/scala/async/run/toughtype/ToughType.scala
@@ -239,9 +239,40 @@ class ToughTypeSpec {
     val result = Await.result(f, 5.seconds)
     result mustEqual (new IntWrapper("foo"))
   }
+
+  @Test def ticket86NestedValueClass() {
+    import ExecutionContext.Implicits.global
+
+    val f = async {
+      val a = Future.successful(new IntWrapper("42"))
+      await(await(a).plusStr)
+    }
+    val result = Await.result(f, 5.seconds)
+    result mustEqual "42!"
+  }
+
+  @Test def ticket86MatchedValueClass(): Unit = {
+    import ExecutionContext.Implicits.global
+
+    def doAThing(param: IntWrapper) = Future(None)
+
+    val fut = async {
+      Option(new IntWrapper("value!")) match {
+        case Some(valueHolder) =>
+          await(doAThing(valueHolder))
+        case None =>
+          None
+      }
+    }
+
+    val result = Await.result(fut, 5.seconds)
+    result mustBe None
+  }
 }
 
-class IntWrapper(val value: String) extends AnyVal
+class IntWrapper(val value: String) extends AnyVal {
+  def plusStr = Future.successful(value + "!")
+}
 
 
 trait A