Fixed the regressions