Fixing loop

Change-Id: I39a5a9dae81c36c0d387288a406409dc3d5b4379