Fixing nil item issues