fixed indexing
Merge branch 'develop' of github.com:antler/caribou-core into develop