makevars fix