fixed some regressions