Fix fallback mechanism