Fixed handling of notifications triggered by guests