Fixing compiling once again

Change-Id: Ie7691311000b162eb4addbef8f9edde1ca7f61b9