fix and add unset