Should this be a while loop just to be safe?