Fix in last commit

Change-Id: I1484f045ff80105c7bd70fe69ecd042fef42eec0