hotfix: undefined indexes