Merge pull request #335 from theresaanna/master

Hopefully squashing the wayfinding bug on the first loaded section once and for all