Notification fix for intermediate encoding. It's incredibly hard
to get all details right. So many moving parts.