Fix hack

Change-Id: I9b91da0d249989cbb80f25cdbc8d29c1a7acfcef