Fix compatibility with 1.8.x