and now fixed the regressions...