Fixed inventory NPE