Fix for GCC 4.7

Change-Id: I169193df361425634ca14b5d05cc5240abfe6cee