add 1.9.5 support