Added temporary workaround to avoid crashes