fixed regressions since 20a1d0d771