bug fix for 7987