Fixing serialization issue.