changes as per https://access.redhat.com/solutions/800663