Fixed "item with same key" warning