WIP

investigating bug 958035