2.1.6 support