Make 1.5 compatible