Crashfix on 3.2 stable version