Forgot to disable the location so that it's one-shot only. Doing it now.
Merge branch 'Map'