Re add fallbacks