Fix regression with #40