Changed shortmap to be strict in i -- now fast again!