fixed ClientMessage union