CRM-14859 enotice fix