Fix previous commit

Change-Id: I629b5f6e57c5d8368bafc544c1c23785ee209a1e