Use short cmd args for v7