fix linked issues