24 Fix bug if cluster name not given