cluster bugfix