Fixed serialization issue