Fixed the mess of Items