client modified accordingly to #6742