Merge pull request #3555 from FernetMenta/aefixes