Added fix for "unset" values