Fixed bug with cluster tool