Fix for bug 2007