Fix bug in A1 clients