Add 1.9.7 support