Fix issue with multiple decimal digits. Fixes issue #1