Bugfix: No cluster_name available