Merge branch 'inventory_fail_fix' into 'master'

Inventory fail fix a.k.a. I'm sorry I thought it checked slots, people are wearing hats on their feet.