Fix to unassigned value issue