bug fix for bug 123.