fixed regressions