v0.6.7 crashfix