Fix regression of the previous commit