fix variable expanding.