WIP issue-358 COPPA fix