CRASH/OPT fix (quick to review)

You might want to remove this.