Temp crash fix