fix fallback logic