diff --git a/expression.c b/expression.c
index 3eff5fa..e463675 100644
--- a/expression.c
+++ b/expression.c
@@ -443,9 +443,13 @@ void ExpressionPushInt(struct ParseState *Parser,
     struct Value *ValueLoc = VariableAllocValueFromType(Parser->pc, Parser,
                             &Parser->pc->IntType, false, NULL, false);
     // jdp: ugly hack to properly print long values
-    ValueLoc->Val->UnsignedLongInteger = IntValue;
-    ValueLoc->Val->LongInteger = IntValue;
-    ValueLoc->Val->Integer = IntValue;
+    ValueLoc->Val->UnsignedLongInteger = (unsigned long)IntValue;
+    ValueLoc->Val->LongInteger = (long)IntValue;
+    ValueLoc->Val->Integer = (int)IntValue;
+    ValueLoc->Val->ShortInteger = (short)IntValue;
+    ValueLoc->Val->UnsignedShortInteger = (unsigned short)IntValue;
+    ValueLoc->Val->UnsignedInteger = (unsigned int)IntValue;
+
     ExpressionStackPushValueNode(Parser, StackTop, ValueLoc);
 }
 
diff --git a/picoc.h b/picoc.h
index 83d7af7..3821e2e 100644
--- a/picoc.h
+++ b/picoc.h
@@ -9,7 +9,7 @@
 /* VER, the git hash number, and TAG are obtained via the Makefile */
 #define PICOC_VERSION TAG " r" VER
 #else
-#define PICOC_VERSION "v2.3"
+#define PICOC_VERSION "v2.3.1"
 #endif
 
 #include "interpreter.h"