fixes regressions in 44d91f6