Fix: ZDDX/undefined problem