Fixing the -Command mode