Now uses more reliable ItemStack method.