Fixed bug that effected cluster numbering