fix for Linaro