This change is beyond the scope of this PR. It's a known issue and is documented in the triggerMethod audit. 

Another known issue is how bad this triggerMethod's name is – also documented.