Fixing the previous commit. We had to normalize evars first.
Adding test for bug #3684.