messenger iterator fixed
Merge branch 'leedam01'