Fix for Linaro GCC 4.8/4.9