Patch for issue 7378