Fix last occurrences of `e'` problems