Fix regression: ef5a12aa2f0994646758459c6b78f2036413060b