Handle case of VAR= better