Make 3.5 compatible