Fix definition of underscored HR's