fix the CMD-o implementation