Real fix for the NODShiLtJ crash.