Fix regression injected by the last PR