Fix for issue #603: event notification