Crash fix
2.0.7
2.0.8