Fixed item issues i think