Fix regression done by previous commit