redundant fallback removed