Fix support for 2.1.x