Port properly close inventories entity check to new system