Fix v4/v6 data source