E should be correct now (found and fixed a plausible bug)
Untested.