Linker fix