MDL-40159 Fixing bug with empty variable, regression from MDL-21097