Better fallback mechanism

Improved fallback mechanism