fix linaro -03 induced change