bug 958 fix