issue86 fix relationship types