cleaner loop avoidance

XXXmpnet

Change-Id: Ia74543a56f2508b69732701a56f1f984df234e11