Hotfix - Array indexing error