fixing regressions