PRINCE: Inventory after swaping and loading fix