fix bug with cluster