Fixing item unpacking