improved fallback