Patch for SF#1630755