Notification fix c/o MC. +Registry