Fixed serialization; am awesome