Fix cbhpm path for headers matching