Switched back to triggerHandler() instead of trigger() to avoid unexpected collection removal
Merge pull request #507 from gmoreira/v2.2.x

Switched back to triggerHandler() instead of trigger() to avoid unexpected collection removal