Another fix for the CLI, maybe now it will work.