Fix compatibility with 2.2