Fix visual clustering