diff --git a/src/me/ByteEdit/edit/StackBasedCalculator.java b/src/me/ByteEdit/edit/StackBasedCalculator.java
index 434e971..d614eb7 100644
--- a/src/me/ByteEdit/edit/StackBasedCalculator.java
+++ b/src/me/ByteEdit/edit/StackBasedCalculator.java
@@ -580,8 +580,10 @@ private boolean handle(AbstractInsnNode node) {
 				change(node);
 				return false;
 			case POP2:
-				stack.pop();
-				stack.pop();
+				Number val = stack.pop();
+				if(!(val instanceof Long) && !(val instanceof Double)) {
+					stack.pop();
+				}
 				change(node);
 				return false;
 			case SWAP: {