Another toolchain fix