Fix client sub