fixes lots of regressions