CRASH/OPT fix (quick to review)