fixed the unsetting when mapping