Fix Map issue