fixing for unset values