Fix 4.8.2 toolchain (2/2)