fix for bug 915034