Fixed clustering again...