fix regressions