Fix Map formatter