E-notice fix to last commit