fix fallback bug