Updated fallback logic