issues modified - nasty one with iterator ifleave