fix crash
next version
fix 1.6.4 support