Fix for GCC 4.8

Change-Id: I442dc4c0db16a46fba87966b52ab3738ef75bbab