[PATCH aeolus] Fixed bug in HWP Matching