Fix for bug 537