diff --git a/db/org.tinygroup.jsqlparser/src/main/java/org/tinygroup/jsqlparser/expression/LongValue.java b/db/org.tinygroup.jsqlparser/src/main/java/org/tinygroup/jsqlparser/expression/LongValue.java
index c8d75f4bc9cb24269a6bb017c6bfb31d655f7798..7f2a2f0b04090618e6c2f6c1b12d2cbfb2742293 100644
--- a/db/org.tinygroup.jsqlparser/src/main/java/org/tinygroup/jsqlparser/expression/LongValue.java
+++ b/db/org.tinygroup.jsqlparser/src/main/java/org/tinygroup/jsqlparser/expression/LongValue.java
@@ -15,56 +15,50 @@
  */
 package org.tinygroup.jsqlparser.expression;
 
+import java.math.BigDecimal;
+
 /**
  * Every number without a point or an exponential format is a LongValue
  */
 public class LongValue implements Expression {
 
-    private long value;
-    private String stringValue;
+	private static final long serialVersionUID = 1L;
 
-    public LongValue(final String value) {
-        String val = value;
-        if (val.charAt(0) == '+') {
-            val = val.substring(1);
-        }
-        this.value = Long.parseLong(val);
-        this.stringValue = val;
-    }
+	// private long value;
+	private BigDecimal value; 
+	private String stringValue;
 
-    public LongValue(long value) {
-		this.value=value;
-		stringValue = String.valueOf(value);
+	public LongValue(final String value) {
+		String val = value;
+		if (val.charAt(0) == '+') {
+			val = val.substring(1);
+		}
+		this.value = new BigDecimal(val);
+		this.stringValue = val;
 	}
 
-    public LongValue() {
-        super();
-    }
-
-
-    public void accept(ExpressionVisitor expressionVisitor) {
-        expressionVisitor.visit(this);
-    }
+	public LongValue() {
+		super();
+	}
 
-    public long getValue() {
-        return value;
-    }
+	public BigDecimal getValue() {
+		return value;
+	}
 
-    public void setValue(long d) {
-        value = d;
-        stringValue = d + "";
-    }
+	public String getStringValue() {
+		return stringValue;
+	}
 
-    public String getStringValue() {
-        return stringValue;
-    }
+	public void setStringValue(String string) {
+		stringValue = string;
+	}
 
-    public void setStringValue(String string) {
-        stringValue = string;
-    }
+	public void accept(ExpressionVisitor expressionVisitor) {
+		expressionVisitor.visit(this);
+	}
 
+	public String toString() {
+		return getStringValue();
+	}
 
-    public String toString() {
-        return getStringValue();
-    }
 }