Fixed - While (true) bug