fix for bug 0005583