Added more hack

Change-Id: I6912ed79ed471d881b7b70e7922089c85211f458