Patched version for RHEL testing