fixed regression, needs a lot of work to prevent regressions