fix match command serialization