Fix preloading Client class