Fixed issue related to nested objects