bug fix/tweek for new 'E5' headers