small adjustment to PREVENT IDIOTIC INFINITE LOOP