Rio's polluted waters where Olympic sailing will take place next year will be in good shape by the time the Games start, IOC President Thomas Bach said on Tuesday (yesterday, Fiji time).