Quick and dirty patch for linker