Fix unset bug