Fixing datafeed