FL-482: mate, fix eclass addition