Potential fix to a crash issue