Fixing add/save component.