bug fix for issue 5797