Fix problem with 'unset'