fixed regressions in last commit