issue #20676: Fix inventory to register the new way.
Merge pull request #543 from jrogelstad/master

issue #20676: Fix a couple things.