Make work with 1.8