possible fix for bug 521