Fix in last commit

Change-Id: Ie9505a4832342b76cc521cca468f1391e5d09ebb