Band-aid to fix crash on NODShiLtJ. Should fix soon