Merge pull request #3541 from FernetMenta/aefixes