diff --git a/src/main/java/cokr/xit/fims/crdn/receive/eqpmnt/LayoutParser.java b/src/main/java/cokr/xit/fims/crdn/receive/eqpmnt/LayoutParser.java
index ddcfd105..41ad7113 100644
--- a/src/main/java/cokr/xit/fims/crdn/receive/eqpmnt/LayoutParser.java
+++ b/src/main/java/cokr/xit/fims/crdn/receive/eqpmnt/LayoutParser.java
@@ -319,12 +319,12 @@ abstract public class LayoutParser {
 					while(!end) {
 						String removed = StringUtils.removeEnd(itemValue, "0");
 						if(removed.equals(itemValue)) {
-							itemValue = removed;
 							end = true;
+						} else {
+							itemValue = removed;
 						}
 					}
 
-					itemValue = itemValue.replaceAll("0+$", "");
 					if(itemValue.endsWith(".")){
 						itemValue = itemValue + "0";
 					}