Partial fix for bug 145