2.0.0-3: Fix construction of non-scalar data.