Fixed data loss in parent element