Fixed bug in BaseClient at line 252