Linaro 4.8 Fix