Linaro 4.7 Fix