Support 2.18

The most important support is at 2.24