Fix Map container