More work to fix crash issue.