Small code improvement

Don't count in loop definition

Change-Id: I5b4dc0579c5e216c716083c61ab0905c446f3612