aeon_issue_35