Fixed serialization bugz