[FIX] Fix notification handling.