Fix to run at command line.