Use the new convention for hclust in R > 3.0.3