Inventory fix

Fix to displaying the inventory correctly.
Merge pull request #1107 from Rhonim/master

Inventory fix