Make 1.6 compatible