Fixed command line behaviour