include workaround class in client