Fix #683 - Don't break out of loop