Improve 1.8 again.