Better fix

Change-Id: I1c73e2af781be916f00fec94d5d6017905ffc469