fixed duplicated mapping