Item uid fix