temporary patch for the scope_id issue