Fix for last commit

Change-Id: I084fb3dea2d61f1faca1e77db4fec98c30f4fb88