ah-HA! Small optimization removes map limit!