Fixing loop

Change-Id: I7e77d52c26f02eb2e9e27b8c9172c7573f1edf9a