fixed cluster_underlying_data so that it works correctly