Fixed serialization issues??