Ticket #31674 Fix removal of leading 0's