Fixed parsing of data objects.