Catch one missing case and use the items id. GH-167
(cherry picked from commit 5b0b1149b873d661045cf4c3c8d8e04f46ff3920)