work on bug 491