Add collision crash workaround