LINARO 4.8 fix