Fix handling of values of nested objects