(partial?) fix
first try at a fix
fixed in-place bug that I introduced
Merge branch 'master' into issue_3540
cleaning up