Tried to fix crash