Fix for toolchain 4.9