Fix build with toolchain 4.8.x