Fixed indexing error
Merge pull request #1361 from control-center/feature/CC-554

Fixed indexing error