Fix Map being active when it's not meant to