Fixed hackfest compatibility (1/2)

Change-Id: Ida7320388920c9dabeedaaac6548c9a1228b5927