Hot fix of incorrect client usage in Monitor