Fix missing index issue. Closes #139
Merge pull request #223 from josegonzalez/139-index-error

Fix missing index issue. Closes #139