Fix for bug 544.