fixed support for complex relations