Fix for linaro 4.8+