- Fix rare crash