Might have fixed an ArrayOutOfBounds bug in the CLI.