Fi fix

Change-Id: Iab7ac40eef55f4c910d923767e97d44a9522d0e3