Crash fix

NEXT