fix 2.2 support