Attempt to fix item NPE bug