Fix Map class.