Fixing previous regressions