Serialization bug fix.