Issue #317 Fixed iteration block