Fixed client class