Fix in last commit

Change-Id: Icef37679eb944ba4923aa70bbc88e5ee4ff18c33