Try to replace emplace_back() call.

Only on some part of the code, need confirmation it works before
propagating.