Corrected octal/decimal handling