still a loop somewhere, fixed?