Fixed the serialization error