Correction in empty var handling