While loop was a little too eager