fixed client js but still flaky