Quick fix to see if I can pinpoint the crash issue.