Fixed bug when passing invalid call index
Merge branch 'mannol1-master'