bug 843004 - address comments from benvie