fix command set evaluation