Patch for missing clip id