candidate fix for bug 238