Should be fixed in 1.25