Fix over aggressive crashing and triumvirate issue