Fix bug related to mapped catalogs in cluster.c