Improve fallback feature.