2.2.0.6 support