Fix Item Checking - Ported from Augury