Fix for lost items on save/load

Issue #2356