Minor change in BaseClient