opps this e-notice fix didn't make it into master - I dropped it when I had to rework the PR