fix regressions
further fixing regressions