Fix second index out of range
Fix index out of range
Merge branch 'feature/jenkins-fix-tests' into develop