minor changes after adding octal support