Rare crash fixed