prevent possible infinite loop in aeolus
Merge pull request #416 from AntonioBL/aeolus_loop

Prevent possible infinite loop in aeolus