Fix unset()