Make 1.3-compatible