Fix for #570
@julian8628 can you review please?
:thumbsup:
Commit 03fd3cd2 fixes this pull-request
Pull-Request has been merged by mikem@redhat.com
Fix for #570