Fixed fallback support