work on bug 917227