suggested patch for review - issue 7158