Corrected client