Improve fallback protection