Fixed serialisation issue