Fixed fallback code