Fixed an indexing bug that was ignoring normalised forms.