Fix regression (with old PR integrated when should not have been)