Fix issue where target is not saved with Interaction