This should be fixed in 1.24