Fix looping... to some extent.