Fix for common module notification take 2