Yet another small bugfix for the automatic cluster merging