Fix regression due to 353d261