Attempt to fix the linker error of 2070f