Merge pull request #1203 from clebertsuconic/2.3.x

avoid cases like https://bugzilla.redhat.com/show_bug.cgi?id=923646