Small bugfix around __collapse_relations__