fixed object handler set and delete
fixed object handler set and delete