Fix regression with command line --go option