issue #1 first iteration fix