add fixed issue for client