#547 iteration fixed