Fix error caused by .95 patch

Change-Id: I35d6837e45273a72def4cda15267def5ba81a494