Fix previous commit

Change-Id: Iebd7674cc8afb547821878dd1565b0f300d22f1f