Fix for change losing evars, also closer to master