fixed regressions during merge