diff --git a/metadata/com.numix.calculator.txt b/metadata/com.numix.calculator.txt
index f217cc03bf..19a97ca1af 100644
--- a/metadata/com.numix.calculator.txt
+++ b/metadata/com.numix.calculator.txt
@@ -29,13 +29,21 @@ Build:2.2,5
     commit=e1e3992774dcdadadf4fdeb0620fb35ec26d438f
     subdir=app
     gradle=yes
-    rm=app/libs/*
     srclibs=Slider@00020deb7fa5499bb33cc4471af2bd5256d10e78,ArityXlythe@459535ba5005c6f3a03101b15354e44df161a637,AChartengineXlythe@0b27908f012ba17360977f8b87c64e755948302c
+    rm=app/libs/*
     prebuild=sed -i -e '/svg-android/d' build.gradle && \
         cp -r $$AChartengineXlythe$$/src/org src/main/java/ && \
-        pushd $$Slider$$ && android update project -p ./ && ant release && popd && \
-        pushd $$ArityXlythe$$ && rm -fR bin/* && find -name "*.java" > sources.txt && \
-        javac -d bin @sources.txt && cd bin && jar cf arity.jar org && popd && \
+        pushd $$Slider$$ && \
+        android update project -p ./ && \
+        ant release && \
+        popd && \
+        pushd $$ArityXlythe$$ && \
+        rm -fR bin/* && \
+        find -name "*.java" > sources.txt && \
+        javac -d bin @sources.txt && \
+        cd bin && \
+        jar cf arity.jar org && \
+        popd && \
         cp $$Slider$$/bin/classes.jar libs/slider.jar && \
         cp $$ArityXlythe$$/bin/arity.jar libs/arity-2.1.6.jar && \
         sed -i -e '$d' -e '/androidsvg/d' -e '/ejml/d' -e '/acra/d' build.gradle && \
@@ -46,9 +54,11 @@ Maintainer Notes:
 * Enable, but wait for upstream to clean up on their
   end for the next version, see: 
   https://github.com/numixproject/com.numix.calculator/issues/14 
+* Reset UCM to Tags when they tag the correct commits again.
 .
 
-Update Check Mode:Tags
-Current Version:2.1
-Current Version Code:4
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:2.2
+Current Version Code:5