fix regressions 1
fix regressions 2