Fix deserialization issue for Order