Fix objects disappearing / getting duplicated after battle.