more work for bug 917227