Added additional check for child objects