Item Model logic fix