Fix possible item state glitch, resulting in NPE