Fix indexedMap #620

Oops about #620 ! But should be fixed now. :-)