Temporary fix for #809, until we can figure out the cause of the crash