Better fallback handling