Fixed a problem where map states would get carried over.