diff --git a/app/build.gradle b/app/build.gradle
index b7f63e75..0b8d36eb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,7 +67,10 @@ dependencies {
     compile('ch.acra:acra:4.7.0') {
         exclude group: 'org.json'
     }
-    compile 'org.solovyev.android.views.dragbutton:drag-button:1.1@aar'
+    compile ':drag-button:1.1@aar'
+    compile ':square-otto:1.3.9-SNAPSHOT'
+    apt ':square-otto-compiler:1.3.9-SNAPSHOT'
+    apt 'com.squareup:javapoet:1.5.1'
     compile 'org.solovyev.android:android-common-lists:1.1.18@aar'
     compile 'org.solovyev.android:android-common-core:1.1.18@aar'
     compile 'org.solovyev.android:android-common-other:1.1.18@aar'
@@ -97,7 +100,6 @@ dependencies {
         exclude(module: 'xpp3')
     }
     compile 'commons-cli:commons-cli:1.2'
-    compile 'com.squareup:otto:1.3.8'
     compile 'com.jakewharton:butterknife:7.0.1'
     compile 'org.solovyev.android.views:linear-layout-manager:0.5@aar'
 
diff --git a/app/misc/libs/jscl-1.0.12.jar b/app/misc/libs/jscl-1.0.12.jar
deleted file mode 100644
index 2c2cc5c7..00000000
Binary files a/app/misc/libs/jscl-1.0.12.jar and /dev/null differ
diff --git a/app/misc/libs/square-otto-1.3.9-SNAPSHOT.jar b/app/misc/libs/square-otto-1.3.9-SNAPSHOT.jar
new file mode 100644
index 00000000..4c1425bd
Binary files /dev/null and b/app/misc/libs/square-otto-1.3.9-SNAPSHOT.jar differ
diff --git a/app/misc/libs/square-otto-compiler-1.3.9-SNAPSHOT.jar b/app/misc/libs/square-otto-compiler-1.3.9-SNAPSHOT.jar
new file mode 100644
index 00000000..7210a99e
Binary files /dev/null and b/app/misc/libs/square-otto-compiler-1.3.9-SNAPSHOT.jar differ
diff --git a/app/src/main/java/org/solovyev/android/calculator/AppModule.java b/app/src/main/java/org/solovyev/android/calculator/AppModule.java
index 06f25c32..956dfb96 100644
--- a/app/src/main/java/org/solovyev/android/calculator/AppModule.java
+++ b/app/src/main/java/org/solovyev/android/calculator/AppModule.java
@@ -7,6 +7,7 @@ import android.os.Looper;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import com.squareup.otto.Bus;
+import com.squareup.otto.GeneratedHandlerFinder;
 import dagger.Module;
 import dagger.Provides;
 import jscl.JsclMathEngine;
@@ -119,6 +120,7 @@ public class AppModule {
         private final Handler handler;
 
         public AppBus(@Nonnull Handler handler) {
+            super(new GeneratedHandlerFinder());
             this.handler = handler;
         }