Fixed rare crash