Fix client answer