Replaced clustercheck with improved version from Olaf van Zandwijk