Fix for nested data structures.