Make 1.8 and 1.9 compatible, sigh…