working on bug 42