Fixed empty related structures bug