fix fallbacks