Fixed linker order issue