fixed duplicate mapping