Fix mapK and mapV amnesia