fixed #196 - cluster broken again