More trying to fix crash