wrong calories for custom food

I created a custom food - tomato soup - by editing a copy from the USDA database and then changing the values to match what's on the package.

When I look at the food from the Foods page, everything is correct and just the way I entered it. The American Food Label in the upper right shows 90 calories, which is what I entered, and the Energy line in the detail section (under General) also shows 90. If I click over to another custom food and then click back to reload, it's all good - still shows 90.

If I try adding it to my diary, though, the same serving shows 138 calories, and the protein and carbs are also different from what I entered.

Is there any way to fix this?