Fix compatibility to 2.1