Another part of the item fix