Get rid of break in loop