Fixed in 1.25