Added wrapper around the returned object to avoid the reordering.