Fix regression in previous commit