fixed json serialization for Message