Fixing serialization.