Fix the hacky way of calling Client