Fix for Linaro