E-notice fix to last commit
Merge pull request #4538 from eileenmcnaughton/enotice

E-notice fix to last commit