Now correctly handle translation maps.  Should fix issue #80