Issue #364 fixed by PR #470 has now regressed. The code has changed quite a bit since, so right now I am not too sure where to intervene to address the regression. Anyone?
