[TASK] Avoid undefined variable