yeat another GCC > 4.8 fix

Change-Id: I01452d4a9d7ad3244e7776083ddc24c330b363e6