bug fix 3696