Remove issue of missing referer - Part2