add more fallback protection