Should fix crash