Fix firstMatch singleIndexAtom