[Fedora-join] Easyfix: how can we improve it