Improve 1.17 and 1.18.