Fix toolchain 4.x