[7] Should fix the crashes now.