client: fixes #1632