diff --git a/src/frontend/org/voltdb/ParameterConverter.java b/src/frontend/org/voltdb/ParameterConverter.java
index <HASH>..<HASH> 100644
--- a/src/frontend/org/voltdb/ParameterConverter.java
+++ b/src/frontend/org/voltdb/ParameterConverter.java
@@ -349,6 +349,10 @@ public class ParameterConverter {
         else if (inputClz == BigDecimal.class) {
             // Only conversion to primitive numeric types are considered
             BigDecimal pBigDecimal = (BigDecimal) param;
+            if (expectedClz == BigDecimal.class) {
+                return VoltDecimalHelper.setDefaultScale(pBigDecimal);
+            }
+
             if (expectedClz == long.class) {
                 try {
                     long result = pBigDecimal.longValueExact();
ENG-<I>: return the decimal when it is expected (#<I>)

Bug fix for the BigDecimal conversion when the expected type is also BigDecimal (which throws an exception in previous commit).