This is the important change to fix the crash. ^