Fix missing index issue. Closes #139