Added support for stripping trailing zeros