Fix for bug 1046091