Fixed style crashes