Fix for bug 528