Better support for 1.8.