ё-фикация as in #1574 by AtIvanov