Fixed command line clients no circle case.

I should probably be writing tests.