Apply the changes in 3.9