bug fix in client annotations