- Fix "index undefined" issue