Fixed node index, closes #37