Fixed serialization bug with new tuple feature