fix-12 Same as above: We may want to restrict the usage of unset?