diff --git a/src/main/java/li/cil/oc/api/IMC.java b/src/main/java/li/cil/oc/api/IMC.java
index fecc03eef..3e2d7c5a3 100644
--- a/src/main/java/li/cil/oc/api/IMC.java
+++ b/src/main/java/li/cil/oc/api/IMC.java
@@ -166,9 +166,17 @@ public final class IMC {
      * Signature of callbacks must be:
      * <pre>
      * boolean select(ItemStack stack)
-     * ItemStack[] disassemble(ItemStack stack, ItemStack[] ingredients)
+     * Object disassemble(ItemStack stack, ItemStack[] ingredients)
      * </pre>
      * <p/>
+     * Where the <code>Object</code> returned from the <code>disassemble</code>
+     * method must be one of the following:
+     * <ul>
+     * <li><code>ItemStack[]</code>: list of resulting items, subject to random failure.</li>
+     * <li><code>Object[]{ItemStack[],ItemStack[]}</code>: two lists of resulting items, the first being subject to
+     * random failure, the second being guaranteed drops (e.g. for item inventory contents).</li>
+     * </ul>
+     * <p/>
      * Callbacks must be declared as <tt>packagePath.className.methodName</tt>.
      * For example: <tt>com.example.Integration.callbackMethod</tt>.
      *
diff --git a/src/main/scala/li/cil/oc/common/template/TabletTemplate.scala b/src/main/scala/li/cil/oc/common/template/TabletTemplate.scala
index 1ab9b3820..457c89c61 100644
--- a/src/main/scala/li/cil/oc/common/template/TabletTemplate.scala
+++ b/src/main/scala/li/cil/oc/common/template/TabletTemplate.scala
@@ -57,9 +57,9 @@ object TabletTemplate extends Template {
   def disassemble(stack: ItemStack, ingredients: Array[ItemStack]) = {
     val info = new TabletData(stack)
     val itemName = Constants.ItemName.TabletCase(info.tier)
-    Array(api.Items.get(itemName).createItemStack(1)) ++ info.items.collect {
+    (Array(api.Items.get(itemName).createItemStack(1), info.container.orNull) ++ info.items.collect {
       case Some(item) => item
-    }.drop(1) // Screen.
+    }.drop(1) /* Screen */).filter(_ != null)
   }
 
   def register() {