removed workaround client