Fix regression of previous commit