Make 0.8-compatible