enable_fallback added