SORT OUT WATER RIGHTS SAYS OECD