fix fetch bugs