Probably fix error that sometimes appears

Sometimes we can't get to map view anymore as it just loads.
Merge branch 'master' into gh-pages