fix for bug 210