fix behaviour of first-class relations