Fixed hackfest compatibility (2/2)

Change-Id: Iedc39fc173eb53105a3532a6e7e5d9b336245caa