Fix Map Deletion