Fix for GCC 4.7

Change-Id: I9cefff6002a5f7732745a3b896e185aef099a567