This should be fixed in 3.8