Fix for RHEL hang issue