bug fixed: duplicate mapping