added a fix for bug 2208