fix interlinking problems