fixed iterate messaged
Merge commit '5588c947168e24c27f3ca604d2cfd569842d9bbe'