fix up issue 10186