Prevent race conditions for map bound set
Merge branch 'map-bounds-fix' into gh-pages