Real fix to real crash