Fixed bug with add.vars