[new_client]: Yet another fix