Better fix to the alert path without requiring private symbols