A potential fix to a crash I cannot reproduce