bugfix clustering