Fix for new toolchains.
Fix for new toolchains.