Fixes https://pagure.io/pagure/issue/4203
rebased onto 127e6ed9823653566eb0c2bbb350cdefc45f732f
:thumbsup:
Pull-Request has been merged by pingou
Fixes https://pagure.io/pagure/issue/4203