fixed some linkage