Patch for 3gpp support