fixed loop conditional - again