correction of some regressions in previous commit