Fix count distinct