[FEATURE] Avoid reference to undefined