Forgot to set index in some callbacks
Merge pull request #151 from mannol1/master

Forgot to set index in some callbacks