additional clustering bug fix