fixed issue with clustering