Fix clustering