[BUGFIX] Check if there already a leading zero