Bug 3021: Fix notification handling