#2372723 enotice fix