fixing linkage issues