diff --git a/tools/cooja/java/org/contikios/cooja/plugins/VariableWatcher.java b/tools/cooja/java/org/contikios/cooja/plugins/VariableWatcher.java
index ea70baf2c..f7a64c747 100644
--- a/tools/cooja/java/org/contikios/cooja/plugins/VariableWatcher.java
+++ b/tools/cooja/java/org/contikios/cooja/plugins/VariableWatcher.java
@@ -625,11 +625,10 @@ public class VariableWatcher extends VisPlugin implements MotePlugin {
           try {
             switch (mType) {
               case BYTE:
-                ret = Byte.decode(text);
-                break;
-              case INT:
+              case SHORT:
                 ret = Integer.decode(text);
                 break;
+              case INT:
               case LONG:
               case ADDR:
                 ret = Long.decode(text);