Fixed clustering issue