Added a temporary fix around the linker switch problem.