Fixed bug, another 206-209 inf. loop bug