Fix 2 usage of item_data