Fixed old dumb CMD stuff