Fixed linking AGAIN