Fix a long-standing unserializer issue.