get_cluster improved
fix bug in get_cluster