fix for linaro 4.9.1