Fixed the mapping operations