fix for issue 7166