Fix for the previous fix - the first digit cannot be zero