avalon linker fix