fix for bug 124