disabled dianne, changes for #751 - not fixed yet