hwaf-project: better cycle detection