fixed issues with unset