Fix crash in NEXT