Fix for bug 41