Locate map when returning, closes #94