Added empty var fix