Fixes big data regressions