Fix nasty crash bug bump v2.0.6