TAMAYA-34: Fixed serialization.