Prevent potential regressions