Fixes #3667
Thanks, I'll merge https://pagure.io/pagure/pull-request/3680 first then come to this one :)
rebased onto 4f62aebdf60b9ff2e7d53735d347652720b7ebe1
Works for me locally :)
Pull-Request has been merged by pingou
Fixes #3667