This may fix the crashes...