Merge pull request #741 from ESwordTheCat/7b#vbri1

Map issues
Welp.