fixed duplicate map