Fixed compatibilty with command line