Client base fix