ActiveAE: some fixes to mode optimized
Merge pull request #3621 from FernetMenta/aefixes

ActiveAE: some fixes to mode optimized